From bbeb2b7b83b0e45a39923dcd4c395f2e310a6186 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 11 Jun 2010 12:35:47 +0100 Subject: [PATCH] libxl: blktap2 fix Signed-off-by: Keir Fraser --- tools/libxl/libxl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c502299e27..a2cd91a8f7 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1253,15 +1253,13 @@ static char *get_blktap2_device(struct libxl_ctx *ctx, static char *make_blktap2_device(struct libxl_ctx *ctx, const char *name, const char *type) { - char *params, *devname = NULL, *rv = NULL; + char *params, *devname = NULL; int err; params = libxl_sprintf(ctx, "%s:%s", type, name); err = tap_ctl_create(params, &devname); - if (!err) { - rv = libxl_sprintf(ctx, devname); - free(devname); - } - return rv; + if (!err) + libxl_ptr_add(ctx, devname); + return err ? NULL : devname; } int libxl_device_disk_add(struct libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk) -- 2.30.2